Skip to content

fix(spi): Correct SPI mapping for ESP32S2 #11510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 24, 2025
Merged

fix(spi): Correct SPI mapping for ESP32S2 #11510

merged 1 commit into from
Jun 24, 2025

Conversation

P-R-O-C-H-Y
Copy link
Member

Description of Change

This pull request refines SPI bus handling for ESP32S2 by correcting SPI bus mappings, and adds error handling for SPI initialization failures.

Updates to SPI bus definitions and mappings:

  • cores/esp32/esp32-hal-spi.c: Adjusted SPI bus mappings for ESP32S2, reducing SPI_COUNT from 3 to 2 and updating index definitions for clock, MISO, MOSI, and SS pins. [1] [2]
  • cores/esp32/esp32-hal-spi.h: Revised SPI bus definitions for ESP32S2 and other targets, aligning bus identifiers (FSPI, HSPI) with their intended functionality.

Error handling improvements:

Initialization logic improvements:

  • libraries/SD/src/SD.cpp: Added a check to ensure spi.begin() succeeds before proceeding with SD card initialization. Returns false if SPI initialization fails.

Tests scenarios

Tested with SD SPI example, using SPI 0 (FSPI) and SPI 1 (HSPI) with PSRAM enabled/disabled.

Related links

Closes #10079

@P-R-O-C-H-Y P-R-O-C-H-Y self-assigned this Jun 24, 2025
@P-R-O-C-H-Y P-R-O-C-H-Y requested review from me-no-dev and a team as code owners June 24, 2025 08:48
@P-R-O-C-H-Y P-R-O-C-H-Y added the Status: Review needed Issue or PR is awaiting review label Jun 24, 2025
@P-R-O-C-H-Y P-R-O-C-H-Y changed the title fix(spi): Update spi bus for esp32s2 fix(spi): Correct SPI mapping for ESP32S2 Jun 24, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 24, 2025 •
edited
Loading

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello P-R-O-C-H-Y, we appreciate your contribution to this project!

📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.
🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.
Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against 21d3e75

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 24, 2025 •
edited
Loading

Test Results

 76 files   76 suites   13m 5s ⏱️
 38 tests  38 ✅ 0 💤 0 ❌
241 runs  241 ✅ 0 💤 0 ❌

Results for commit 21d3e75.

♻️ This comment has been updated with latest results.

@me-no-dev me-no-dev added Status: Pending Merge Pull Request is ready to be merged and removed Status: Review needed Issue or PR is awaiting review labels Jun 24, 2025
@lucasssvaz lucasssvaz added this to the 3.2.1 milestone Jun 24, 2025
@lucasssvaz lucasssvaz moved this from Todo to In Review in Arduino ESP32 Core Project Roadmap Jun 24, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 24, 2025 •
edited
Loading

Memory usage test (comparing PR against master branch)

The table below shows the summary of memory usage change (decrease - increase) in bytes and percentage for each target.

MemoryFLASH [bytes]FLASH [%]RAM [bytes]RAM [%]
TargetDECINCDECINCDECINCDECINC
ESP32P40⚠️ +40.000.00000.000.00
ESP32S3💚 -16⚠️ +120.000.00000.000.00
ESP32S2💚 -760💚 -0.020.00💚 -160💚 -0.100.00
ESP32C30⚠️ +40.000.00000.000.00
ESP32C60⚠️ +40.000.00000.000.00
ESP32H20⚠️ +40.000.00000.000.00
ESP320⚠️ +40.000.00000.000.00
Click to expand the detailed deltas report [usage change in BYTES]
TargetESP32P4ESP32S3ESP32S2ESP32C3ESP32C6ESP32H2ESP32
ExampleFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAM
ArduinoOTA/examples/BasicOTA0000000000--00
AsyncUDP/examples/AsyncUDPClient0000000000--00
AsyncUDP/examples/AsyncUDPMulticastServer0000000000--00
AsyncUDP/examples/AsyncUDPServer0000000000--00
DNSServer/examples/CaptivePortal0000000000--00
EEPROM/examples/eeprom_class00000000000000
EEPROM/examples/eeprom_extra00000000000000
EEPROM/examples/eeprom_write00000000000000
ESP32/examples/AnalogOut/LEDCFade00000000000000
ESP32/examples/AnalogOut/LEDCGammaFade00------0000--
ESP32/examples/AnalogOut/LEDCSingleChannel00000000000000
ESP32/examples/AnalogOut/LEDCSoftwareFade00000000000000
ESP32/examples/AnalogOut/SigmaDelta00000000000000
ESP32/examples/AnalogOut/ledcFrequency00000000000000
ESP32/examples/AnalogOut/ledcWrite_RGB00000000000000
ESP32/examples/AnalogRead00000000000000
ESP32/examples/AnalogReadContinuous00000000000000
ESP32/examples/ArduinoStackSize00000000000000
ESP32/examples/CI/CIBoardsTest0000💚 -72💚 -1600000000
ESP32/examples/ChipID/GetChipID00000000000000
ESP32/examples/DeepSleep/TimerWakeUp0000000000--00
ESP32/examples/DeepSleep/TouchWakeUp000000------00
ESP32/examples/FreeRTOS/BasicMultiThreading00000000000000
ESP32/examples/FreeRTOS/Mutex00000000000000
ESP32/examples/FreeRTOS/Queue00000000000000
ESP32/examples/FreeRTOS/Semaphore00000000000000
ESP32/examples/GPIO/BlinkRGB00000000000000
ESP32/examples/GPIO/FunctionalInterrupt00000000000000
ESP32/examples/GPIO/FunctionalInterruptStruct00000000000000
ESP32/examples/GPIO/GPIOInterrupt00000000000000
ESP32/examples/HWCDC_Events0000--000000--
ESP32/examples/MacAddress/GetMacAddress00000000000000
ESP32/examples/RMT/Legacy_RMT_Driver_Compatible00000000000000
ESP32/examples/RMT/RMTCallback00000000000000
ESP32/examples/RMT/RMTLoopback00000000000000
ESP32/examples/RMT/RMTReadXJT00000000000000
ESP32/examples/RMT/RMTWrite_RGB_LED00000000000000
ESP32/examples/RMT/RMT_CPUFreq_Test00000000000000
ESP32/examples/RMT/RMT_EndOfTransmissionState00000000000000
ESP32/examples/RMT/RMT_LED_Blink00000000000000
ESP32/examples/ResetReason/ResetReason00000000000000
ESP32/examples/ResetReason/ResetReason200000000000000
ESP32/examples/Serial/BaudRateDetect_Demo00000000000000
ESP32/examples/Serial/OnReceiveError_BREAK_Demo00000000000000
ESP32/examples/Serial/OnReceive_Demo00000000000000
ESP32/examples/Serial/RS485_Echo_Demo00000000000000
ESP32/examples/Serial/RxFIFOFull_Demo00000000000000
ESP32/examples/Serial/RxTimeout_Demo00000000000000
ESP32/examples/Serial/Serial_All_CPU_Freqs00000000000000
ESP32/examples/Serial/Serial_STD_Func_OnReceive00000000000000
ESP32/examples/Serial/onReceiveExample00000000000000
ESP32/examples/TWAI/TWAIreceive00000000000000
ESP32/examples/TWAI/TWAItransmit00000000000000
ESP32/examples/Template/ExampleTemplate00000000000000
ESP32/examples/Time/SimpleTime0000000000--00
ESP32/examples/Timer/RepeatTimer00000000000000
ESP32/examples/Timer/WatchdogTimer00000000000000
ESP32/examples/Touch/TouchInterrupt000000------00
ESP32/examples/Touch/TouchRead000000------00
ESP32/examples/Utilities/HEXBuilder00000000000000
ESP32/examples/Utilities/MD5Builder00000000000000
ESP32/examples/Utilities/SHA1Builder00000000000000
ESP_I2S/examples/ES8388_loopback00000000000000
ESP_I2S/examples/Record_to_WAV0000--------00
ESP_I2S/examples/Simple_tone00000000000000
ESPmDNS/examples/mDNS-SD_Extended0000000000--00
ESPmDNS/examples/mDNS_Web_Server0000000000--00
Ethernet/examples/ETH_TLK11000----------00
Ethernet/examples/ETH_W5500_Arduino_SPI0000💚 -72💚 -1600000000
Ethernet/examples/ETH_W5500_IDF_SPI0000💚 -20💚 -1600000000
Ethernet/examples/ETH_WIFI_BRIDGE0000💚 -76💚 -160000--00
FFat/examples/FFat_Test00000000000000
FFat/examples/FFat_time0000000000--00
HTTPClient/examples/Authorization0000000000--00
HTTPClient/examples/BasicHttpClient0000000000--00
HTTPClient/examples/BasicHttpsClient0000000000--00
HTTPClient/examples/ReuseConnection0000000000--00
HTTPClient/examples/StreamHttpClient0000000000--00
HTTPUpdate/examples/httpUpdate0000000000--00
HTTPUpdate/examples/httpUpdateSPIFFS0000000000--00
HTTPUpdate/examples/httpUpdateSecure0000000000--00
HTTPUpdateServer/examples/WebUpdater0000000000--00
LittleFS/examples/LITTLEFS_test00000000000000
LittleFS/examples/LITTLEFS_time0000000000--00
NetBIOS/examples/ESP_NBNST0000000000--00
NetworkClientSecure/examples/WiFiClientInsecure0000000000--00
NetworkClientSecure/examples/WiFiClientPSK0000000000--00
NetworkClientSecure/examples/WiFiClientSecure0000000000--00
NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade0000000000--00
NetworkClientSecure/examples/WiFiClientShowPeerCredentials0000000000--00
NetworkClientSecure/examples/WiFiClientTrustOnFirstUse0000000000--00
PPP/examples/PPP_Basic00000000000000
PPP/examples/PPP_WIFI_BRIDGE0000000000--00
Preferences/examples/Prefs2Struct00000000000000
Preferences/examples/StartCounter00000000000000
SD/examples/SD_Test⚠️ +4000💚 -68💚 -16⚠️ +40⚠️ +40⚠️ +40⚠️ +40
SD/examples/SD_time⚠️ +40⚠️ +120💚 -76💚 -16⚠️ +40⚠️ +40--⚠️ +40
SD_MMC/examples/SD2USBMSC0000----------
SD_MMC/examples/SDMMC_Test0000--------00
SD_MMC/examples/SDMMC_time0000--------00
SPI/examples/SPI_Multiple_Buses0000💚 -68💚 -1600000000
SPIFFS/examples/SPIFFS_Test00000000000000
SPIFFS/examples/SPIFFS_time0000000000--00
TFLiteMicro/examples/hello_world00000000000000
Ticker/examples/Blinker00000000000000
Ticker/examples/TickerBasic00000000000000
Ticker/examples/TickerParameter00000000000000
USB/examples/CompositeDevice000000--------
USB/examples/ConsumerControl000000--------
USB/examples/CustomHIDDevice000000--------
USB/examples/FirmwareMSC000000--------
USB/examples/Gamepad000000--------
USB/examples/HIDVendor000000--------
USB/examples/Keyboard/KeyboardLogout000000--------
USB/examples/Keyboard/KeyboardMessage000000--------
USB/examples/Keyboard/KeyboardReprogram000000--------
USB/examples/Keyboard/KeyboardSerial000000--------
USB/examples/KeyboardAndMouseControl000000--------
USB/examples/MIDI/MidiController000000--------
USB/examples/MIDI/MidiInterface000000--------
USB/examples/MIDI/MidiMusicBox000000--------
USB/examples/MIDI/ReceiveMidi000000--------
USB/examples/Mouse/ButtonMouseControl000000--------
USB/examples/SystemControl000000--------
USB/examples/USBMSC000000--------
USB/examples/USBSerial000000--------
USB/examples/USBVendor000000--------
Update/examples/AWS_S3_OTA_Update0000000000--00
Update/examples/HTTPS_OTA_Update0000000000--00
Update/examples/HTTP_Client_AES_OTA_Update0000000000--00
Update/examples/HTTP_Server_AES_OTA_Update0000000000--00
Update/examples/OTAWebUpdater0000000000--00
Update/examples/SD_Update⚠️ +4000💚 -68💚 -16⚠️ +40⚠️ +40⚠️ +40⚠️ +40
WebServer/examples/AdvancedWebServer0000000000--00
WebServer/examples/FSBrowser0000000000--00
WebServer/examples/Filters0000000000--00
WebServer/examples/HelloServer0000000000--00
WebServer/examples/HttpAdvancedAuth0000000000--00
WebServer/examples/HttpAuthCallback0000000000--00
WebServer/examples/HttpAuthCallbackInline0000000000--00
WebServer/examples/HttpBasicAuth0000000000--00
WebServer/examples/HttpBasicAuthSHA10000000000--00
WebServer/examples/HttpBasicAuthSHA1orBearerToken0000000000--00
WebServer/examples/MultiHomedServers0000000000--00
WebServer/examples/PathArgServer0000000000--00
WebServer/examples/SDWebServer⚠️ +40⚠️ +120💚 -72💚 -16⚠️ +40⚠️ +40--⚠️ +40
WebServer/examples/SimpleAuthentification0000000000--00
WebServer/examples/UploadHugeFile⚠️ +40⚠️ +120💚 -64💚 -16⚠️ +40⚠️ +40--⚠️ +40
WebServer/examples/WebServer0000000000--00
WebServer/examples/WebUpdate0000000000--00
WiFi/examples/FTM/FTM_Initiator0000000000--00
WiFi/examples/FTM/FTM_Responder0000000000--00
WiFi/examples/SimpleWiFiServer0000000000--00
WiFi/examples/WiFiAccessPoint0000000000--00
WiFi/examples/WiFiClient0000000000--00
WiFi/examples/WiFiClientBasic0000000000--00
WiFi/examples/WiFiClientConnect0000000000--00
WiFi/examples/WiFiClientEvents0000000000--00
WiFi/examples/WiFiClientStaticIP0000000000--00
WiFi/examples/WiFiExtender0000000000--00
WiFi/examples/WiFiIPv60000000000--00
WiFi/examples/WiFiMulti0000000000--00
WiFi/examples/WiFiMultiAdvanced0000000000--00
WiFi/examples/WiFiScan0000000000--00
WiFi/examples/WiFiScanAsync0000000000--00
WiFi/examples/WiFiScanDualAntenna0000000000--00
WiFi/examples/WiFiScanTime0000000000--00
WiFi/examples/WiFiTelnetToSerial0000000000--00
WiFi/examples/WiFiUDPClient0000000000--00
Wire/examples/WireMaster00000000000000
Wire/examples/WireScan00000000000000
Wire/examples/WireSlave00000000000000
BLE/examples/BLE5_extended_scan--00--000000--
BLE/examples/BLE5_multi_advertising--00--000000--
BLE/examples/BLE5_periodic_advertising--00--000000--
BLE/examples/BLE5_periodic_sync--00--000000--
BLE/examples/Beacon_Scanner--00--00000000
BLE/examples/Client--00--00000000
BLE/examples/EddystoneTLM_Beacon--00--00000000
BLE/examples/EddystoneURL_Beacon--00--00000000
BLE/examples/Notify--00--00000000
BLE/examples/Scan--00--00000000
BLE/examples/Server--00--00000000
BLE/examples/Server_multiconnect--00--00000000
BLE/examples/UART--00--00000000
BLE/examples/Write--00--00000000
BLE/examples/iBeacon--00--00000000
ESP32/examples/Camera/CameraWebServer (1)--0000------00
ESP32/examples/Camera/CameraWebServer (2)--0000------00
ESP32/examples/Camera/CameraWebServer (3)--00----------
ESP32/examples/DeepSleep/ExternalWakeUp--0000------00
ESP_NOW/examples/ESP_NOW_Broadcast_Master--00000000--00
ESP_NOW/examples/ESP_NOW_Broadcast_Slave--00000000--00
ESP_NOW/examples/ESP_NOW_Network--00000000--00
ESP_NOW/examples/ESP_NOW_Serial--00000000--00
ESP_SR/examples/Basic--00----------
HTTPClient/examples/HTTPClientEnterprise--00000000--00
Insights/examples/DiagnosticsSmokeTest--00000000--00
Insights/examples/MinimalDiagnostics--00000000--00
Matter/examples/MatterColorLight--00000000--00
Matter/examples/MatterCommissionTest--00000000--00
Matter/examples/MatterComposedLights--00000000--00
Matter/examples/MatterContactSensor--00000000--00
Matter/examples/MatterDimmableLight--💚 -160000000--00
Matter/examples/MatterEnhancedColorLight--00000000--00
Matter/examples/MatterEvents--00000000--00
Matter/examples/MatterFan--00000000--00
Matter/examples/MatterHumiditySensor--00000000--00
Matter/examples/MatterMinimum--00000000--00
Matter/examples/MatterOccupancySensor--00000000--00
Matter/examples/MatterOnIdentify--00000000--00
Matter/examples/MatterOnOffLight--00000000--00
Matter/examples/MatterOnOffPlugin--00000000--00
Matter/examples/MatterPressureSensor--00000000--00
Matter/examples/MatterSmartButon--00000000--00
Matter/examples/MatterTemperatureLight--00000000--00
Matter/examples/MatterTemperatureSensor--00000000--00
Matter/examples/MatterThermostat--00000000--00
Matter/examples/WiFiProvWithinMatter--00000000--00
NetworkClientSecure/examples/WiFiClientSecureEnterprise--00000000--00
RainMaker/examples/RMakerCustom--00000000----
RainMaker/examples/RMakerCustomAirCooler--00000000----
RainMaker/examples/RMakerSonoffDualR3--00000000----
RainMaker/examples/RMakerSwitch--00000000----
SimpleBLE/examples/SimpleBleDevice--00--00000000
WebServer/examples/Middleware--00000000--00
WiFi/examples/WPS--00000000--00
WiFi/examples/WiFiBlueToothSwitch--00--0000--00
WiFi/examples/WiFiClientEnterprise--00000000--00
WiFi/examples/WiFiSmartConfig--00000000--00
WiFiProv/examples/WiFiProv--00000000--00
Zigbee/examples/Zigbee_Analog_Input_Output--000000000000
Zigbee/examples/Zigbee_Color_Dimmer_Switch--000000000000
Zigbee/examples/Zigbee_Electrical_AC_Sensor--000000000000
Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase--000000000000
Zigbee/examples/Zigbee_Gateway--000000----00
Zigbee/examples/Zigbee_On_Off_Switch--000000000000
Zigbee/examples/Zigbee_Range_Extender--000000000000
Zigbee/examples/Zigbee_Thermostat--000000000000
OpenThread/examples/CLI/COAP/coap_lamp--------0000--
OpenThread/examples/CLI/COAP/coap_switch--------0000--
OpenThread/examples/CLI/SimpleCLI--------0000--
OpenThread/examples/CLI/SimpleNode--------0000--
OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode--------0000--
OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode--------0000--
OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode--------0000--
OpenThread/examples/CLI/ThreadScan--------0000--
OpenThread/examples/CLI/onReceive--------0000--
OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode--------0000--
OpenThread/examples/Native/SimpleThreadNetwork/RouterNode--------0000--
Zigbee/examples/Zigbee_Binary_Input--------0000--
Zigbee/examples/Zigbee_CarbonDioxide_Sensor--------0000--
Zigbee/examples/Zigbee_Color_Dimmable_Light--------0000--
Zigbee/examples/Zigbee_Contact_Switch--------0000--
Zigbee/examples/Zigbee_Dimmable_Light--------0000--
Zigbee/examples/Zigbee_Electrical_DC_Sensor--------0000--
Zigbee/examples/Zigbee_Illuminance_Sensor--------0000--
Zigbee/examples/Zigbee_OTA_Client--------0000--
Zigbee/examples/Zigbee_Occupancy_Sensor--------0000--
Zigbee/examples/Zigbee_On_Off_Light--------0000--
Zigbee/examples/Zigbee_On_Off_MultiSwitch--------0000--
Zigbee/examples/Zigbee_PM25_Sensor--------0000--
Zigbee/examples/Zigbee_Power_Outlet--------0000--
Zigbee/examples/Zigbee_Pressure_Flow_Sensor--------0000--
Zigbee/examples/Zigbee_Scan_Networks--------0000--
Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy--------0000--
Zigbee/examples/Zigbee_Temperature_Sensor--------0000--
Zigbee/examples/Zigbee_Vibration_Sensor--------0000--
Zigbee/examples/Zigbee_Wind_Speed_Sensor--------0000--
Zigbee/examples/Zigbee_Window_Covering--------0000--
BluetoothSerial/examples/DiscoverConnect------------00
BluetoothSerial/examples/GetLocalMAC------------00
BluetoothSerial/examples/SerialToSerialBT------------00
BluetoothSerial/examples/SerialToSerialBTM------------00
BluetoothSerial/examples/SerialToSerialBT_Legacy------------00
BluetoothSerial/examples/SerialToSerialBT_SSP------------00
BluetoothSerial/examples/bt_classic_device_discovery------------00
BluetoothSerial/examples/bt_remove_paired_devices------------00
ESP32/examples/DeepSleep/SmoothBlink_ULP_Code------------00
Ethernet/examples/ETH_LAN8720------------00

@me-no-dev me-no-dev merged commit b7e5169 into master Jun 24, 2025
87 checks passed
@me-no-dev me-no-dev deleted the fix/spi-eps32s2 branch June 24, 2025 11:43
@eMUQI eMUQI mentioned this pull request Jun 25, 2025
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@me-no-dev me-no-dev me-no-dev approved these changes

Assignees

@P-R-O-C-H-Y P-R-O-C-H-Y

Labels
Status: Pending Merge Pull Request is ready to be merged
Projects
Arduino ESP32 Core Project Roadmap
Status: Done
Milestone
3.2.1
Development

Successfully merging this pull request may close these issues.

SPI buses on ESP32-S2 are mislabeled in arduino-esp32
3 participants
@P-R-O-C-H-Y @me-no-dev @lucasssvaz